From 9c1063f602a3f7a2f67fd64369dbad1c7b2cd658 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 18 Jan 2015 15:24:30 -0500 Subject: [PATCH] broadway: Only use abstract sockets when they are supported GIO has a function to check whether abstract sockets are supported, so use it. This should make broadway work on Freebsd again. https://bugzilla.gnome.org/show_bug.cgi?id=742980 --- gdk/broadway/broadwayd.c | 7 ++++--- gdk/broadway/gdkbroadway-server.c | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gdk/broadway/broadwayd.c b/gdk/broadway/broadwayd.c index e1a0fc8a0b..feca655aeb 100644 --- a/gdk/broadway/broadwayd.c +++ b/gdk/broadway/broadwayd.c @@ -456,10 +456,11 @@ main (int argc, char *argv[]) if (display == NULL) { #ifdef G_OS_UNIX - display = ":0"; -#else - display = ":tcp"; + if (g_unix_socket_address_abstract_names_supported ()) + display = ":0"; + else #endif + display = ":tcp"; } if (g_str_has_prefix (display, ":tcp")) diff --git a/gdk/broadway/gdkbroadway-server.c b/gdk/broadway/gdkbroadway-server.c index 9033e3e27b..40f1ca731f 100644 --- a/gdk/broadway/gdkbroadway-server.c +++ b/gdk/broadway/gdkbroadway-server.c @@ -110,10 +110,11 @@ _gdk_broadway_server_new (const char *display, GError **error) if (display == NULL) { #ifdef G_OS_UNIX - display = ":0"; -#else - display = ":tcp"; + if (g_unix_socket_address_abstract_names_supported ()) + display = ":0"; + else #endif + display = ":tcp"; } if (g_str_has_prefix (display, ":tcp")) -- 2.30.2